From: mark@maw48.kings.cam.ac.uk Date: Wed, 9 Mar 2005 20:09:10 +0000 (+0000) Subject: bitkeeper revision 1.1236.20.1 (422f57e64AxXLq_2TgjJdCVeFgugMg) X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~17857^2~58^2~2^2 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=495ffe8b8ffa1eef7f2fe26b74a2684820c2cbba;p=xen.git bitkeeper revision 1.1236.20.1 (422f57e64AxXLq_2TgjJdCVeFgugMg) Hopefully fix hotplugging. --- diff --git a/linux-2.6.10-xen-sparse/drivers/xen/usbback/usbback.c b/linux-2.6.10-xen-sparse/drivers/xen/usbback/usbback.c index fc98ac18a7..d20833616e 100644 --- a/linux-2.6.10-xen-sparse/drivers/xen/usbback/usbback.c +++ b/linux-2.6.10-xen-sparse/drivers/xen/usbback/usbback.c @@ -725,7 +725,7 @@ static void dispatch_usb_io(usbif_priv_t *up, usbif_request_t *req) purb->dev = port->dev; purb->context = pending_req; purb->transfer_buffer = - (void *)MMAP_VADDR(pending_idx, 0) + (buffer_mach & ~PAGE_MASK); + (void *)(MMAP_VADDR(pending_idx, 0) + offset_in_page(buffer_mach)); if(buffer_mach == 0) purb->transfer_buffer = NULL; purb->complete = __end_usb_io_op; diff --git a/linux-2.6.10-xen-sparse/drivers/xen/usbfront/usbfront.c b/linux-2.6.10-xen-sparse/drivers/xen/usbfront/usbfront.c index 5fe65a7cba..46cca3058a 100644 --- a/linux-2.6.10-xen-sparse/drivers/xen/usbfront/usbfront.c +++ b/linux-2.6.10-xen-sparse/drivers/xen/usbfront/usbfront.c @@ -331,6 +331,9 @@ static int xhci_port_reset(usbif_vdev_t port) xhci_drain_ring(); } + xhci->rh.ports[port].pe = 1; + xhci->rh.ports[port].pe_chg = 1; + return xhci->awaiting_reset; }